From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 19 Dec 2012 14:16:22 +0000 (+0000)
Subject: xen: arm: stub out wallclock time.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7502
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=87623ef4652de4466b1f23e4280e740faac6bad3;p=xen.git

xen: arm: stub out wallclock time.

We don't currently have much concept of wallclock time on ARM (for
either the hypervisor, dom0 or guests). For now just stub everything
out. Specifically domain_set_time_offset, update_vcpu_system_time and
wallclock_time.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
`
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S
index c641e7adda..dec72bb9e1 100644
--- a/xen/arch/arm/dummy.S
+++ b/xen/arch/arm/dummy.S
@@ -9,9 +9,6 @@ x:	mov pc, lr
 /* PIRQ support */
 DUMMY(nr_irqs_gsi);
 
-/* VCPU */
-NOP(update_vcpu_system_time);
-
 /* Grant Tables */
 DUMMY(steal_page);
 
@@ -21,8 +18,6 @@ DUMMY(page_is_ram_type);
 /* Other */
 DUMMY(domain_get_maximum_gpfn);
 DUMMY(domain_relinquish_resources);
-DUMMY(domain_set_time_offset);
 DUMMY(dom_cow);
 DUMMY(send_timer_event);
 DUMMY(share_xen_page_with_privileged_guests);
-DUMMY(wallclock_time);
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index b6d701535d..ac606f7ebb 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -25,6 +25,7 @@
 #include <xen/mm.h>
 #include <xen/softirq.h>
 #include <xen/time.h>
+#include <xen/sched.h>
 #include <asm/system.h>
 
 /*
@@ -185,6 +186,23 @@ void udelay(unsigned long usecs)
     isb();
 }
 
+/* VCPU PV clock. */
+void update_vcpu_system_time(struct vcpu *v)
+{
+    /* XXX update shared_info->wc_* */
+}
+
+void domain_set_time_offset(struct domain *d, int32_t time_offset_seconds)
+{
+    d->time_offset_seconds = time_offset_seconds;
+    /* XXX update guest visible wallclock time */
+}
+
+struct tm wallclock_time(void)
+{
+    return (struct tm) { 0 };
+}
+
 /*
  * Local variables:
  * mode: C